Merge version 2:4.23.6+dfsg-1+rpi1 and 2:4.23.6+dfsg-2 to produce 2:4.23.6+dfsg-2...

diff --cc debian/changelog
index 3cb6f2579e180c8e4672544cf3f76f2f90ffe807,b8929ad7e07bb9c317a3263416907857da3d5010..7840b567ced92c134a645a9929d4a73d032702df
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- samba (2:4.23.6+dfsg-1+rpi1) forky-staging; urgency=medium
++samba (2:4.23.6+dfsg-2+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 2:4.19.1+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 12 Oct 2023 15:37:21 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 06 Mar 2026 15:47:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 18 Mar 2026 15:36:45 +0000
++
+ samba (2:4.23.6+dfsg-2) unstable; urgency=medium
+ 
+   * samba-bgqd.service: ship a unit file, but not auto-enable it
+   * d/rules: do not enable nmbd by default
+   * d/control: drop libnss-winbind & libpam-winbind from
+     samba-ad-dc:Recommends (Closes: #1130068)
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Sun, 08 Mar 2026 14:27:42 +0300
  
  samba (2:4.23.6+dfsg-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge